Merge git://git.denx.de/u-boot-mmc
authorTom Rini <[email protected]>
Fri, 29 Sep 2017 03:31:11 +0000 (23:31 -0400)
committerTom Rini <[email protected]>
Fri, 29 Sep 2017 03:31:11 +0000 (23:31 -0400)

Trivial merge